merge trunk
authorK. Handa <handa@gnu.org>
Mon, 11 Mar 2013 09:06:39 +0000 (18:06 +0900)
committerK. Handa <handa@gnu.org>
Mon, 11 Mar 2013 09:06:39 +0000 (18:06 +0900)

Trivial merge